Merge tag 'upstream/1.0.4'
authorAron Xu <aron@debian.org>
Mon, 8 Aug 2016 06:36:18 +0000 (14:36 +0800)
committerAron Xu <aron@debian.org>
Mon, 8 Aug 2016 06:36:18 +0000 (14:36 +0800)
Upstream version 1.0.4


Trivial merge